Changes for a lighter code