updates made to use assemblies