Revise a little bit for the Fast