removed alerts, added comments