updated version
misc