Changed a bit of structure