refactor to current adria
some work on first "boss"