Started on a more familiar design