Reverting Task 18