Custom units

It's just your code rewritten to be more explicit and execute once