got rid of boolean flagged