Some Assembly changes