More robustness checking. project looks good!