added legacy changes