updated to better var names