More improvements 2