Final touches to the raw mode