working on refresh 3