added more core stuff