added table and collection scenes and improved implementation