Simplified last commit