simplified some stuff for good