#179 Improves visibility