Moved some scenario specific functions