Re-doing a few things…