Testing dev branch - removed some shit