some updates before pull
pull from work changes