Fixed to work with new board layout