added hopefully all