More conditions for buttons added