coding changes and updates