better security
refactor assignment creation