adding joshs changes to dev