This is way better than my first try