updated w/ phase 1