fixed more of below