Found a better way. Reworking