Added support for patella and tibia / other optimizations