Made a few changes to make faup easier to understand