second step to completion
a few mor changes