Added New measurement functions and revised structure of input form.