fixed functions so far?