most of new ids added and formatting