added Joes changes