Updated, still not working properly though.