changed a few around