Slight modification to (hopefully) reduce databaase load.