updating changes to include lastest fixes