Projects refactored part II