draft final form of current package