will redo these soon