Prior to putting in custom commands