added more logic to pickup items