- change boolean flags to BitSets