Final version with 2 extras