a few changes, Ill do more work tonight!
merge