Up to Ch.6 fixed