At least made the datapin array and separate vars consistant