modify to deployable version