partial fixed yay :)