updated with fast picker