updated with capastr