updated for deadbolt 2.1 final