some core modifications