reworked scene classes