fixed Geo's code