fixing those up too