Improvements based on first submission
Include feedback from first submission