adding lastest changes