Use globalstep, add some improvements and one TODO