Fixed assembly and new function

Changed back assembly, porting, and much more