issue-9: Changes to rendering pipeline in order to simplify piece
highlighting