updated assembly stuff