Modified some things for it to be better represented