Reorganized for easier naming conventions