Rearranging for easier code push