Modifications and initial commit