Completed

for sasa Macic only