Reworked all assemblies