modified current and added new metric functions utilizing django built-in functions