Updated to new Scene System