added in some stuff