Updates based on addy's feedback