Updated with recent feedback