Improvment and legacy code