translated 07, fixed some issues in 02