Changes suggested by samantha