Added convexification of obj and constraints