modifications and added 3d awesomeness