Still have some issues with duplicate ids so changed them all