Fix, make coding assignments more flexible