Some changes and new files