fixed broken parts