Better component (35/36)

Better component