Adding and rearranging for MacOS