added spinners where needed