Added some extra logging