some changes made, but adr not working