moved around sections for readability