Implemented proposals

From Strategic Planning