some updates, intrudices legacy compatability