added dapt handling