More work on the structure