some changes and bringing in files