Ideas to add for merge