Added other required bits