refactor to adria