changed a few names for readability