Rearranged to accommodate my new setup