merged lastest changes