Still trying to find the elegant solution