some changes to avoid conflicts
merging changes