fixed more -- need align