Let's make this public as well to be consistent?