Updating responses based on @lucas42's feedback on #1