Added additional annoyances