updated -- everything good