Make it more beautiful. #2