Integrated Shasak's fileSending commit