final versions again (i think everything works now)