added bunch of things