Integrate et-step into latest version

Original et-step code is by @hasinhayder