updating to work with latest oscar