Modify onReceive
[WIP] View Comments