Added compatibility for BC's oil!