implemented Core modifications