completed updates previously discussed (forgot to save file)