Incorporate quick feedback from robert