Some changes to the core classe and background