added slightly different fido solution