almost completed re-style