merged with joey still need to merge with thomas