added in "types" as an option