Feat: lets refactor this according to @simi