Re-Edited more files