updates by Gyu-Ho Lee