If there is a better solution i would appreciate