working on refresh 8