reorganized with new boolean for draft mode