Updated to reduce duplication