2 Commits (optimize-properties)