removed alerts added returns for no reason