last feedback from @kthrtty