made changes reverse compatible