Improved parts, still bugged