fixin this crap