changed AND/OR logick in Subspecs