this breaks backwards compatibility