changed a few constraints. Graphics updated to match