De-dupe After and make a separate method