Still improving default arguments