New Code works, deleting old code