moved items into if __name space