fix #3 - Additional work to the multistep form