Tested (bugs fized)