Move to single var at the top, keep the setter here