added rest of parts