some if adjustements