Extras fixed (addExtra)
Fixed all editX