Updates:
- Code refactoring so that not duplicating