merge cole's changes into my code