tweeked if conditionals