original version for development