Added latest changes by anthony