added stage types
cleanup
cleanup