added support and timer