cleaned up 6.4