Fixed parts of it