new branch for new modeling
fixing conflicts