Enhanced the performance