latest changes based on great feedback