Trying to downsize this mess...