more public code :)