Rejigged function positions