found a better solution