Fixing Performance Issue