working on refresh 12