Dave/const public functions