Make nice (24/36)

Make nice