Updated with more debug