cleaned up 96