added in some things