some fix and new files model