some changes on picking but not working yet