hand edited regened file. Added optional defaults