adding draft and cleaning