Removed updated flags to make implementation easier