Better extension (4/27)

Better extension