lava fix - needs to be redrawn still