more modifications to allow sangsoo's code to run.