Fixed Issues - Need to add in check for parts