Abe - Add function headers
Abe - merged