this is working a bit better than it was before. no jinxees