Made this version working as well