Simplified the whole set.