Added optimization ideas