Trying to make a better way!