scene management added