committing some older changes