Integrate feedback from |miska|