started fixing constraints