updated most steps