final changes for production, now is running on totoro