This better (20/30)

This better