cleaned up 6.2