Modified for production Issues