reverting some changes until I can determine what I broke