Kicked out Heiser and added Jonathan