Corrected Implementation Errors and Updated Template File