More attempts to shorten the code