Second implementation pass