merge from lrampa
update timestamp