Temporary hack until this section can be refactored