Fixed the part where it was broken and didn't work