updated some assumptions