added some shit but not happy