Commit the quick hack