Updated Yeonil's latest changes

Updated Yeonil’s latest changes, since he wouldn’t do it himself. :)