Final Solution Commit