some handy modifications