changes from gomcpc