reverted all performance enhancement