Trying to build a better solution