Updated template and completed assignment