switch back to old version with constraints