Updated to fit more recent methods