Working but still hangs a little