Updated to normal structure