change some shit to get it to work