I did more work on it -^)