more reorganization for better senses making