Added smal improvments