fixed more changes