Adding feature that measurements can be discarded and improving module
ui.