File structure changed a little bit