Fixed intend and refresh function
Added notifications