recieving vinh's changes
merging
stencil