made minor changes to support pushnotification and removed window alerts