Solving issues after revision