updates to all stages, still only passing 8/17