Revert "Revert "reverted back to normal""

This reverts commit 3d2170b2818e4de5d530ba198962e68a936782a9.
Revert "removed quantity related functions"

This reverts commit 330196b8ac70d4e23c5902ce057c1145cd36091a.
removed unit_conversion functions