Update2
Assembly and other updates
Small updates