Moved to lambda averaging again, WIP