Added Alert and fixed method