Little details, we are almost done!