#10, #11, #12. Adding updated files.