Updated Makefile and forced myself to use clear constraints