can ext from code and fix some bugs