Updated if-statments