proj2 stuff copying over