os161-1.11 commit #1 CLEAN VERSION