adding all the recent changes not syncd yet