draft and other related stuff fixed