And once more but do it right this time