Updated User Interaction part