this is the second modification after finishing... time to sleep..zy