Re-organized to improve