rest of changes mentioned in last commit