Changes for receiver