Moved Scene and added some validation checks