Added else if and new ops