removed comments and put commented out unworking fix to notification issue