Updated with empty functions