Some changes to previous one