Added additional steps