Bug fix:
- resolved previous commit that corrupted this 2 files due to merging
not going 100% well