committing some functionality changes