removed instance of state, now just uses current