improvments
merged conflicts