AliaK77

@andrevenancio @crzypatchwork would you have a chance to review this please.