Additional improvments