Updated version and added more logging