removed alert box + new feedback