Second Commit

Much improvement, very good.