Yamalok can wait.

Jagga Jiunda E (2018) features a shiny, updated afterlife.  Chitragupta, the judge of the dead, has retired and been replaced by Chitr Singh (Gurpreet Ghuggi), the book of destiny has been uploaded to a shiny new computer system, souls are ferried on shiny spacefaring elevators rather than the traditional buffalo, and Yama himself is wearing a cool white suit and is played by Jackie Shroff.  This is a Yamalok where they make Baahubali jokes.

It's also a Yamalok where they make mistakes.  Yama's assistants collected the soul of Jagga (Daljeet Kalsi), a kind, generous, loyal man who loves his mother, when they were supposed to take Daljeet (also Daljeet Kalsi). a spectacularly corrupt and brutal police officer who is cruel to his mother.  Unfortunately, Jagga has already been cremated, so they cannot simply send him back.

Instead, they place Jagga's soul in Daljeet's body.  Jagga is a good man, so he immediately uses his new life to start making things better, first by being kind to Daljeet's mother (Sunita Dhir), then by cleaning up the local police force and clashing with Daljeet's old partner-in-crime Vikram (Harp Farmer), son of the local MLA.  (And I'm not sure who plays the MLA, but he does a fantastic Amrish Puri impression.)  Along the way he finds time to woo the lovely Harleen (Kainaat Arora), who is technically his subordinate but let's not worry about that right now.  Meanwhile, a ghost called Billu Comrade (Sardar Sohi) keeps trying to talk Jagga into completing the unfinished business of the local restless spirits.

"Good man takes over the life of a bad man" is not the most original premise, even with the heavenly clerical error, but it's a fun premise, with a lot of comedic and dramatic potential.  That's why I was so disappointed when the movie suddenly shifted genres to become a brutal revenge melodrama, especially when a minor female character was brutally attacked and murdered just to make sure Jagga is properly motivated.  As revenge melodramas go, it's competently executed, but I want my supernatural comedy back.