integrate feedback from Albert