Updated package to allow creation, with bugs