resolved the code merge between what I had and K