Bringing in new changes

from Donguk and Daniel