merge joshs changes