sent for the comp
Before refactoring
merged