code refactor, and support world 16