version with toast issue fixed