remove px stuff and make faster