Here's my improvements