Final changes to diagnostic.... I sucked at this...sorry. womp.