making the changes to make this work smoother.