Minor feature step tweaking