Trying to complete Armando, work on Core.