Updated hamiltonian calculation and implement eigenvectors & eigenvalues