modified after adnan bhai discussion
after retrofit integration