edited to state dev version