Humm the return isn't currently used. Will remove.