Dev tsj

forgot to merge in branch