Resolve points 2 and 3