Input & Validate added