Added joint modeling stuff