saguna's small changes
saguna and adrian's changes merged