Now working with any board