Added observer and refrehsing