Rework first and last
0.9.0