Simplifying logic
Merge branch 'develop' of github.com:alexsomeoddpilot/timber into develop