Added other controls