Made constraint a lot better