upgraded grid and account modules