implemented changes to receiver