Solving mohssen comments