Adding local implementaiton