updated things slightly