Better jade structure
Fixed jades