updated/removed crap