code review; add world support