updating core and fixing afc functionality