Fix all bugs and ready to be deploy