working on refresh 2