Fixed Unused Functions