Updates by Smixin