Made Bobby's changes