adding all the new stuff