Worked a bit more on the units