Added more validation. Working on refresh