simplified extra code
simplified extra code