SLight upd
merge