Updating "Find me" with proper TODO mark