Made some improvments