Implement gotem and refactor reveal function
resolve conflict