Added return mode