fixed shit ch2