- various modifications