Added swype measurements + RAW mode