Yung's branch

updating from my branch