Simplified everything. Added commit patch.