working on refresh 7