Reworks and fixes Joshua logic