more changes based on feedback