updated w/ relevant code