fixed the broken parts