Main core (17/18)

Main core