Added if statement and some operators