correction from adrian's ideas