Made a new version which still has some bug to fix