Castle on loch (WIP) improving