some initial testing and changes made due to changes in assemble