Integrated some missing parts