Cleaned up the messes, but it works!!