Return now works again, expands vars in format
Ups version