ok fixed more