Resolving issues part deaux