Updated with isa warnings