Updated return value according to new U.I display methods.
Updated return value according to new U.I display methods.
Merge branch 'bleeding_edge'