okay, will fix this and the next if