Kind of fixed a bit more