Added more User input features