Added functionality and unit clarification