Updated version & new func usage