now with a block handling on refriesh