Modifications to allow Side-Loading.