It took soo long....

Plus some modifications