Enhanced step scripts :-)