Edited Conceptual
Merged