merging kheang's code