Dan's initialize changes