Updated to latest version of Hotplate
More changes to adapt to the everchanging hotplate