change the code a bit

Still got bug