latest changes
removed extra directory
updated changes with slots--working on map