updated version, think thats needed