Moved and updated pre and post