Removed duplicate method and added tracing