includes new handlers