Alert implemented, better refresh