totally, it's just I didn't want to change too much code, and now it should be feature complete