Trying to solve #2