Added significant enhancement ice/thaw and refactored
Merge