Cleaned up 6