Still trying to reduce complexity