Version 2.2. Heaviliy refactored and add elapsed steps functionality