Happy return to Edinburgh