added in new stuff