Modifications based on Kibit suggestions