Code(s) merged & bonus #1