merged and cleaned up