Some big improvments