Fixed it to work more like how they want