many more changes from stage