added several new things