Update for new before_setp API
Paper initial submision