7 Commits (optimize-properties)