Updated version after Monday 6/9 deadline