updating to use a property instead of a static bool