done some polishing