Moved if statements