Removing joint and going with a less simulated approach