Design Changes by Amit