change structure
change to false for production