changed a bit on the structure