some changes and new file with map