incorporated changes from dev