Removed temp hack
Updated WSHH