added dapt handling
added dapt handling