Blueprint, cleanup, connect 3 update