Changes ported over from Base