Roy: Inputs added