Updated to the new "old" scene framework