a few changes that were not committed earlier