Tuned debuggin a bit more