Control stuff better