logic updates; framework was put to use and needed some updating