revert to using static state