changes to highlighting and flippies