Removed a wrapping Future. Renamed some vals.