Merged and cleaned up.