updated some of prior changes