Public version :)