added else if's