#1, #2 resolved