A fresh look doesn

@stellarisone