reverting last two possible issues