added final modifications