changed things around abit