Added some enhancements to Shark