I think fixing 1 solves 2 implicitly