Reworked code to remove Multi dependency