Added a better solution with Bakthat