Refactor of live results