major changes on chemistry.java