adding edin back in