Updated piickup and retrieval