added final stuff for now