removed alerts. add condition for supplied values