made some changes, made it possible to edit