updated things a bit