add more changes not present in master