commit #3 fixes