diff --git a/exercises/11_hashmaps/hashmaps1.rs b/exercises/11_hashmaps/hashmaps1.rs
index e646ed71..0df70000 100644
--- a/exercises/11_hashmaps/hashmaps1.rs
+++ b/exercises/11_hashmaps/hashmaps1.rs
@@ -1,20 +1,19 @@
 // A basket of fruits in the form of a hash map needs to be defined. The key
 // represents the name of the fruit and the value represents how many of that
-// particular fruit is in the basket. You have to put at least three different
+// particular fruit is in the basket. You have to put at least 3 different
 // types of fruits (e.g apple, banana, mango) in the basket and the total count
-// of all the fruits should be at least five.
-//
-// Make me compile and pass the tests!
+// of all the fruits should be at least 5.
 
 use std::collections::HashMap;
 
 fn fruit_basket() -> HashMap<String, u32> {
-    let mut basket = // TODO: declare your hash map here.
+    // TODO: Declare the hash map.
+    // let mut basket =
 
     // Two bananas are already given for you :)
     basket.insert(String::from("banana"), 2);
 
-    // TODO: Put more fruits in your basket here.
+    // TODO: Put more fruits in your basket.
 
     basket
 }
diff --git a/rustlings-macros/info.toml b/rustlings-macros/info.toml
index 58c0cdd5..cf70d4d4 100644
--- a/rustlings-macros/info.toml
+++ b/rustlings-macros/info.toml
@@ -558,12 +558,8 @@ paths to bring these two in using only one line."""
 name = "hashmaps1"
 dir = "11_hashmaps"
 hint = """
-Hint 1: Take a look at the return type of the function to figure out
-        the type for the `basket`.
-
-Hint 2: Number of fruits should be at least 5. And you have to put
-        at least three different types of fruits.
-"""
+The number of fruits should be at least 5 and you have to put at least 3
+different types of fruits."""
 
 [[exercises]]
 name = "hashmaps2"
diff --git a/solutions/11_hashmaps/hashmaps1.rs b/solutions/11_hashmaps/hashmaps1.rs
index 4e181989..3a787c43 100644
--- a/solutions/11_hashmaps/hashmaps1.rs
+++ b/solutions/11_hashmaps/hashmaps1.rs
@@ -1 +1,42 @@
-// Solutions will be available before the stable release. Thank you for testing the beta version 🥰
+// A basket of fruits in the form of a hash map needs to be defined. The key
+// represents the name of the fruit and the value represents how many of that
+// particular fruit is in the basket. You have to put at least 3 different
+// types of fruits (e.g apple, banana, mango) in the basket and the total count
+// of all the fruits should be at least 5.
+
+use std::collections::HashMap;
+
+fn fruit_basket() -> HashMap<String, u32> {
+    // Declare the hash map.
+    let mut basket = HashMap::new();
+
+    // Two bananas are already given for you :)
+    basket.insert(String::from("banana"), 2);
+
+    // Put more fruits in your basket.
+    basket.insert(String::from("apple"), 3);
+    basket.insert(String::from("mango"), 1);
+
+    basket
+}
+
+fn main() {
+    // You can optionally experiment here.
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn at_least_three_types_of_fruits() {
+        let basket = fruit_basket();
+        assert!(basket.len() >= 3);
+    }
+
+    #[test]
+    fn at_least_five_fruits() {
+        let basket = fruit_basket();
+        assert!(basket.values().sum::<u32>() >= 5);
+    }
+}