new changes added on 6/6