removed alerts, added more functionality