updating
removing unused vars