And forgot to remove debug println's.