More proper (6/48)

More proper