Change logic code to aid network fixes #35