Complex and bootstrap changes