Faye added, various helpers added