updated first
fixed merging