Some finally changes