Finally fixing everything