TODO @Hiiias
some changes (that's what git says)