lost some updates last commit, added them back in