Some more bug is fixed but still needs to work