Base: Almost finished fixing