combined and fixed our two parts