Added front end shim