@danberindei overload done and pushed to fork!