changed things a little