latest modifications respoding to requirements