Attemping to improve performance