rearranged params section, added live highlight