Added Evan's changes
Remove types