keyboard heuristic implemented
merging changes
merging