Updated remaining files