Moved improvments into separate file