Adjust code per Bob's recommendations
Update requirements