Cleaned up & readied for dual setup usage