a bunch stuff have been added