now respects enabled/disabled