measurements geometry improvements