@Cadair's small changes