& fast
merge & fix