merge with Shaun's changes and resubmit