Added short code.
Updated function names.