start of better? fixed func support