fixed conditioning issues and started the user history