Changes based on Andrew's feeback