changed things a bit