ready for production... again