way better alert handling!!!