Readded boolean logic