tidied up performance