Added shim and demo page