Changes by Sams
changes