better constraint code; added g05, g06