Attempted fix 2 + verisoning