fix functions go and step