added final stuff