Further changes based on Matt's feedback

Further changes based on Matt's feedback