Added elk stuff.