third commit with all updated source files