Better extension (5/27)

Better extension