added final variablen etc