Found a better way