some bug Fixed, still not working properly