describe: Refactored the codepath