updated with answers to questions from milestone2