mereging from melli182 to ale770