updated with scheduler addon