some changes based on my read-through