added our own base layer and fix wrap