Focus spec
Add more logging