almost completely fixed