Improvments, add bd