needed to fix this up too