Re-factorying 3rd step