Two problems added but not solved yet :/