Updated Blueprint according to Nick review