Final modification for assesment