Changed HOOK tags to TODO