Simplified code from previous commit