First step - some improvments