adding checks for capabilities