Work in progress for guide updates