after callback option and loads of other improvements