added Rebecca's code updates