Reduced some complexity